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

Change-Id: I6312b972019a5d98f9466faf83a958de2fe9657d