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

Change-Id: I39299cf2e0eb5fb8c5506663ede8b7fe7b50a6fa