Merge "Remove metrics collector service trampoline"