Merge "Remove obsolete @VisibleForTesting Annotation" am: 1e8249a1d6 am: 2c8ace0794
am: eeb74b5312

Change-Id: I4599bd202f51726db78c37213afd26a69c8ee31d