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

Change-Id: I096f029e3a9d751fa848ab43f10c9bdf32102a4d