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

Change-Id: Ie02148a67e2dff3d90d93fd0d57d077339b66f36