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

Change-Id: If7dd8b444286f6442f942c968630f63861aaf5e0