[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 8ee02968b0  -s ours
am: 558a43f008  -s ours

Change-Id: I04843faa35b853a16abb651ad8317b844ac35f87