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

Change-Id: I28bb3af2d2875d2fe4fded7e7bd919cc189e6132