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

Change-Id: Ia54672d985803d98b2cc6866838fec47eac2fa37