am 230033ba: Merge "Don\'t force the boot image to using quick."

* commit '230033ba185ef83f7be84a4839d4d2e195ab50f4':
  Don't force the boot image to using quick.