[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 42b0be0f8e  -s ours

Change-Id: I7c04cfc0e7828d23b8cf43ef0f19fbafddf59ad7