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

* commit 'ffd4fee911ee43fbec7b08b829d15a7593421dba':
  Revert "Allow system images larger than 2GiB."