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

Change-Id: I67889bad668733dac4551cde9487ea5f0ef0549d