Merge "TrustManagerService: Fix service binding leak" into oc-dev