am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into...
am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb
* commit '699a0969':
DO NOT MERGE Removing an activity that shouldn't go into samples