Merge "Revert^2 "Turn ContentProvider injection failures into errors."" into main