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

Change-Id: I326b4e17f4336092a2a99a536a24fa73d16f4a50