Merge "Disable startup provider due to resource loading issue"