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

Change-Id: Ic70d436c6654990239c753c04d01d56ceffe3b28