Merge changes from topic "ipsec-svc-cleanup"
am: 9778c7884f

Change-Id: Ide81ae76bd05ba3a2cc7c06c072306d30a489057
tree: dd6009b557e1bda175233ffbbf0d37bccda9aef5
  1. core/
  2. services/
  3. wifi/