Merge "Fix an unintentional change in method signature and avoid an API change."