Merge "Skip Test if US Locale Not Available" into froyo