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

Change-Id: Iff988b8d8e61ede781c0eec5c43bd2ca64234dab