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

Change-Id: Ifb2c14caf3a3a066328af54898d1af87a822b2f4