Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread