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

Change-Id: I6fa0e584d4bae34b211412d77a0886e8933c449e