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

Change-Id: I54cec15cbf9cdcc96deeb92d15c6c6a93a3666c0