Merge "Add a query parameter to look-up a SIP address." into ics-mr1