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

Change-Id: I886fd8255f8d14f24628abe8b259ced4f816079a