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

Change-Id: I4199b6ed5886b0255d37fdb3408b34c953280def