Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread