am 3b88235d: am 9f201b18: am 088521ef: Merge "Allow system images larger than 2GiB, pt. 2"

* commit '3b88235d04156d8a0346d74b5d3a9575c3b02121':
  Allow system images larger than 2GiB, pt. 2