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

* commit '8d960687dc5c5d8474450068afe7b64ffef3d3db':
  Don't force the boot image to using quick.