Merge "Fixing test affected by API renaming."