[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 937c10cf -s ours am: 8a904532 -s ours Change-Id: I8a06eb86095809d2991833663f88aae327312fb8