Merge "Fix typo according to API review."