Merge "Add checks for FEATURE_CAMERA_ANY being reported properly." into jb-mr1-dev