am 0ea53689: Merge "Fix combination of prebuild/no-image."

* commit '0ea536897c078761e0309437a3d25fbbf53c94a3':
  Fix combination of prebuild/no-image.