Merge "Camera: codegen spec update"