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

Change-Id: I7eb57ab8852aace6d7bd86bb90409c2d055373c7