Merge changes from topic "IPMS1"
am: 3627deac88

Change-Id: I80fc9437a041de68ce16ae5e85189b5d48fe1c97