Merge "Remove old reference to SipCallServiceProvider" into nyc-mr1-dev