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

Change-Id: I4562f3e8beb8c3b9b944e0ed505f2e10544292cb