[automerger skipped] Merge changes from topic "b113052379-cp-from-pi-dev-p1"
am: 17e83a3fdf  -s ours

Change-Id: I842ab1cb4c297241acd41c2e3a86a930b52e52a2