am 76afe3e5: Merge "Remove dead code referencing an obsolete interface." into honeycomb

* commit '76afe3e5cdf3a531835d349a6ab04f2fe82e3958':
  Remove dead code referencing an obsolete interface.