am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev

* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
  Reduce camera launch time by about 250ms.