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

Change-Id: I456e0a191993e800603262cc9dc91fa06ada0ebe