Merge "Prevent crashes if boot images fail to load" am: 81e01d72ab
am: 6630bd773f

* commit '6630bd773f90569b9fedd0da57434091f4cb66f7':
  Prevent crashes if boot images fail to load