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

Change-Id: I7cbca3732d90eba8c8dc93f9fd1d724db7c2763a