Merge "Reserve boot image memory in one go."
am: 1a615cfe4f

Change-Id: I8d65c952a8c5cc53f9928953d155dfc6ad31924a