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

Change-Id: I5a6ca59f7dfba236969f75e6ffab7156d3bc12e0