Merge "Don\'t abort during app image loading with no boot image"
am: 80bda17

* commit '80bda17d9810507fa016206fff90acd0e1337a3a':
  Don't abort during app image loading with no boot image

Change-Id: I054825af8356a1bfdc0f6d43c8166b6a1bbd5c34