Merge "Fix for SmsManagerTest" into gingerbread