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

* commit '3a3dd8cca31cd41f953a4a2d9baca9f2dcd466c9':
  Don't abort during app image loading with no boot image

Change-Id: I94088b14c7155e7393b410bc1fccab1803251d6e