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

Change-Id: Id01273b122e879462b1432e7a2cb09a208c9722d