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

Change-Id: I3fa67322c62da457bb2fad4ff58c7b8643cc749a