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

Change-Id: I91f1f8aea862279640d2853d7618c2ee5c4dd1ab