Merge "Remove legacy code that should not be used" into honeycomb