Merge "Api change."