Merge "Use class retention for VisibleForTesting annotations"