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

Change-Id: I9c69f4a6a593dc8924557fa7829b880614b57639