Merge "ALOGE does not match triggering condition."

            ALOGE("%s: Camera %d: Scene mode override list is an "

                    "unexpected size: %zu (expected %zu)", __FUNCTION__,

                    cameraId, sceneModeOverrides.count,

                    availableSceneModes.count);

                    availableSceneModes.count * kModesPerSceneMode);

            return NO_INIT;

        }

        for (size_t i = 0; i < availableSceneModes.count; i++) {