Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I2245a44c6a15967994746c9140d246fd311cc6e4