Merge "Make @VisibleForTesting accessible for proguarding." into mnc-ub-dev am: 21af2850d1
am: c2c19d6fd2

* commit 'c2c19d6fd264ac45041f35f509cb974514f31c10':
  Make @VisibleForTesting accessible for proguarding.