Merge "Use class retention for VisibleForTesting annotations" am: 5724841581 am: 94d5456d0e am: a5538805d9
am: 2130e26bca

Change-Id: I3c4199fa186374bc8adc2d3068bba102c6da4df8