Merge "Update to follow API change."