Merge "Camera: fix expectation of BLOB buffer size" into nyc-dev