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

Change-Id: I68a740ddb96bf8a1e5666803c623e26ce53fb65f