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

Change-Id: I22426a1c36709f9772debe40374238f8ea895ecb