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

Change-Id: I1ba13750b51dfae5b6fe1664c9c7c862ad48818a