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

Change-Id: I97e50afd9ea5e08d74be9c33c9cf0e46c8cbf174