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

Change-Id: I10a8d75b720ea587356427f54f558bc7b07a30f8