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

Change-Id: I4ff02b0d0ad342d8e00e81e590993f97ba47a9c3