Merge "Remove redundent @VisibleForTesting annotation"