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

Change-Id: I27943bb25f1b751ab45e47392052df03b8ac9817