Merge "Add a configuration to enable or disable support for repair mode" into udc-dev-plus-aosp