Merge "Fixing tests that did not get updated earlier" into froyo