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

Change-Id: If552c833def48c291c70b729a2ca92ef1ca3e570