Merge "Fixed method name that was changed in a previous CL."