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

Change-Id: Iffc3769407b9928fcee5f375dd2a229ab3cbbb1d