Merge "Remove metrics collector service trampoline" am: b256a47064
am: 949ffecffe

* commit '949ffecffe08d93d6d98102fae5b2c9274da4258':
  Remove metrics collector service trampoline