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

Change-Id: I3f7567815bdef39bbc9b7942503cf33a13724dfe