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

Change-Id: I1efc8f292ea59c1f0ed6a480dae2234aa43d3047