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

Change-Id: I003bbecc224f760ddf7ee9f54158a5c4f204881a