am 48fe5b7c: am fc267120: am b7e5ab6f: Merge "Allow system images larger than 2GiB."

* commit '48fe5b7cadca3c945e81182411e9537cb11d81d3':
  Allow system images larger than 2GiB.