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

Change-Id: I84103a307e130a3062ba7cf066812f4199a13bc8