Merge "Adjust visibility rules for IPSec" am: 29e3c0ba36 am: f7a649984f am: 5d8d8a237e am: 5ae29e4bcd am: 23ab00eba2

Change-Id: Icf5e2f0faa2b81cc3ab4faef1b0a0b37f4484a57