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

Change-Id: Ifbcdf349f3738d5a3ff6b40154c47b6898542b37