Fixed merge fail - this branch doesn't have javascript_strings.