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

Change-Id: Ie6af75836c0ac66fc49cf102765f6596bf786c0d