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

Change-Id: I13bbecfe12a0512995dbdfb86a5d6f1040a16346