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

Change-Id: I13b89f3b7e636b2be68b06fade4d48de9e4ee993