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

Change-Id: I17d15a972542971244a962b1c8401dd9b6de0c50