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

Change-Id: Ia184acee468fb1753d1d2745141469d4393e0cc6