am 76ae4b80: am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."

* commit '76ae4b804e620082f3dc7eefac7f22e57a818ef1':
  Don't register methods when there's nothing to register.