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

Change-Id: I93188f60f233f5d761ccd0591e999117e5f710df