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

Change-Id: I4af2cb2250e48423166e9a80afbc2019d7df72e1