Merge "Java7 Locale & Script related changes."