Merge "Fix LocationTest to Support More Locales" into gingerbread