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

Change-Id: Ic3068fdd4e3612f74840a8679a32f1a7a859b5f3