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

Change-Id: I81983a4cf2160560059756c84af42ad550a436ae