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

Change-Id: Ia1c086bd96bc217574681bed78e9f9a43bac0676