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

Change-Id: I1be5503af2914e73fcccebcffb7fff808f14091f