[automerger skipped] Merge "Revert "Add Statsdhelper and Metric Collectors"" am: 2f02beb9 am: 53fb3583 am: 0c82d5f2 -s ours Change-Id: I35ce74a441459b586954bb6ff13fff2d96e62c99