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

Change-Id: I0e30862a30a9a315d8bf95fb6582ee98294c1ad6