Merge \\"Remove old reference to SipCallServiceProvider\\" into nyc-mr1-dev am: 0f922456b2
am: 613fd2d661

Change-Id: Id8e9a437a9c1c0afc7e01aa2529cbe439ffb3d78