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

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