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

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

Change-Id: I95a063f6f58a85719ff159d3acf3e06406366c0e