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

Change-Id: I1e1a3097356f11b758bbb191f8f296288a850c3a