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

* commit '81e01d72abfe3136554cdaa354be683e2cb636af':
  Prevent crashes if boot images fail to load