am 85bccf6e: (-s ours) am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb

* commit '85bccf6e0b555bc5245628ba7340123b6b367b51':
  DO NOT MERGE Removing an activity that shouldn't go into samples