Merge "Cosmetic Cleanups for IpSecService"
am: 87d6fc04b2

Change-Id: If47968dbd55f8f38f9e8dda4d78a0e2e41827da8
tree: cbefcd35378660d402e199e9b8dd6ea41880939c
  1. core/
  2. services/
  3. wifi/