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

Change-Id: Ic0c1c06b51a764406bf3851d773b40413e3a33dc