Merge "Follow internal impl change."