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

Change-Id: I0370b83a268542c5c72253f69bc9c4e06f22fb05