am 3c6dad19: am 94a26df8: Merge "Refactor CameraService to handle errors properly." into klp-dev

* commit '3c6dad193367f499112b57e506183f02419a2e00':
  Refactor CameraService to handle errors properly.