Merge "ART: Better InitWithoutImage error messages" am: 37c36dcf2e
am: 6f12dca493

* commit '6f12dca493386fb655d9a28c8bab90e078ab9a55':
  ART: Better InitWithoutImage error messages