Merge "Remove metrics collector service trampoline"
am: b256a47064

* commit 'b256a470649ebd407d8dacbec48690fd0e26f048':
  Remove metrics collector service trampoline