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

Change-Id: I71cb0948d9b07a9abe3ab1fd489addafa0f7f3ff