Merge "Add VisibleForTesting annotation."