Merge "Fix NPE in SmsManagerTest Setup Method" into gingerbread