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

Change-Id: I3ee77030c1d13c9ec62399268c4376989863c607