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

Change-Id: Ie33e09892b21aee2a1310ded541d04f8f4d2480c