Merge "Add production visibility to @VisibleForTesting" into nyc-mr1-dev