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

Change-Id: Iedd0ef251e3506b45c70191817fee444e677f6fa