Merge "Inject telephony component facotry using jar"