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

Change-Id: Ieae60b363dc21a93e6a9434cc0e2dc9a9a0e8252