Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb