Merge "Remove use of old methods." into honeycomb