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

Change-Id: I69458a53780efafd5f3b6e526d9fbdc55d6819e5