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

Change-Id: I0bdac355bd951c1533c43e09f802111dbdc1f69b