[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: e24ea1eb -s ours am: 58aa92f2 -s ours Change-Id: Ie8af0d62878922ae317f5915b529746d0ffd7e00