Merge "Fix the unnecessary phone selection." into gingerbread