Merge "Adjust visibility rules for IPSec" am: 29e3c0ba36

Change-Id: Ibe7200d2afa40f9a0559aa631de5fac6d7bc521d