Merge "Use class retention for VisibleForTesting annotations" am: 57248415 am: 94d5456d am: a5538805 am: 2130e26b Change-Id: I3c4199fa186374bc8adc2d3068bba102c6da4df8