Merge "Throw proper exceptions in SipManager" into gingerbread