Merge "DO NOT MERGE: CameraITS: backport caps from master" into nyc-mr1-dev