Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" into gingerbread