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

Change-Id: Iac3aa05b4de68b818fe840c2ade4aa600fe29622