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

Change-Id: I3b65d9a0273f2b41dcefe2c34d9d87c7b733f654