Merge "Added Locking for MmTelFeature"