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

Change-Id: I2e210bde82c9ecdc18822f30a66775fe1c1ee1bc