Merge "Remove obsolete @VisibleForTesting Annotation"
am: 1e8249a1d6

Change-Id: I1668f1754a01a120647da78bf750795e765a4870