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

Change-Id: I90c49818286689f495ab71ea25af81e8f8d3d173