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

Change-Id: I2971810401325cfb1769156f816be43f069d0315