Merge "Added Locking for MmTelFeature" into pi-dev