Merge "Fix broken test due to API rename"