Merge "Camera: codegen update" into nyc-dev