Merge "Removing unused assets" into honeycomb