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

Change-Id: I98909c7943d207a02c6d16806caba6050341d8ba