Merge changes from topic "b113052379-cp-from-pi-dev-p2"
am: c9fc995e0e

Change-Id: Ia83844fa93a02234178042be85cc99eaeaca221f