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

Change-Id: Id8a65630cbdbe5ce82be5a315490660a304fc29d