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

Change-Id: I9ce8f6d478e7c99fa8c8b284d5d3d811651a4736