Merge "Remove dead code referencing an obsolete interface." into honeycomb