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

Change-Id: I64d3307c76273b6117141196c24fff8310825056