Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00
am: cc51ef0a47

Change-Id: I0a9c52ca26ad1b7e4505f7c9dc32ad9550b62afc