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

Change-Id: I6634c8acea7522eef288e13ba4b995eac053c493