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

Change-Id: Iabeca2fc58516f0b9e29e0c53931591c79d28341