Merge \"Use collector specific helper classes\"
am: dca4d5d2bf

Change-Id: I537fd415cce0329e59596d706e3fc721b83f1123