Merge "Camera: codegen update" into nyc-dev am: 0ae49cc667
am: 1f85a37630

* commit '1f85a37630357f68beba0e06f036ac54ff279f83':
  Camera: codegen update