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

Change-Id: I00025770d926af2dbf399d28f8e855568e260b8b
5 files changed