Merge "Clean up: fix incorrect @VisibleForTesting imports"