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

Change-Id: I50a2aafaa9380ab1070575192a4610a45180aa8e