Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread