Merge changes from topic "IPMS1"
am: 3627deac88

Change-Id: I80fc9437a041de68ce16ae5e85189b5d48fe1c97
tree: d0a074df6aab7a73d586138eb3a0e2176568ce0a
  1. core/
  2. services/
  3. tests/