Merge pi-platform-release to stage-aosp-master - DO NOT MERGE Change-Id: I80ac8293968d0bb3673b82143760093c08532cd5