Merge changes Ia92e0619,Ifd0cfc06

* changes:
  Don't reference UNDEMOTE_METHOD
  Don't use internal VisibleForTesting annotation