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

Change-Id: I402674a9d07fb5e7716a9fcd1d0fbc41e04b2cc7