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

Change-Id: I168c30b29d73d3f547d8bd6d4414dfbf1b6c0120