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

Change-Id: I358d4586c415d5d86cb7084d5f8ed571cb86f7eb