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

* commit '94a26df84f226120075ca3d9866f2687e11c9dcd':
  Refactor CameraService to handle errors properly.