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

Change-Id: Ieb6b2cc777ac0767d5558a083affecfcc2b2b9d0