Merge "Update with froyo change."