Merge "Remove the VisibleForTesting annotation." into main