Merge "Remove obsolete @VisibleForTesting Annotation"