Merge "Add metrics event for trampoline activity" into oc-dr1-dev