Merge "Revert "Allow system images larger than 2GiB."" into lmp-mr1-dev