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

Change-Id: I74ff319dbce6a0ba4d279c6565f7200a862c7e38