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

Change-Id: I30a1c57e345d1f069b8c101af02856b36265f9f1