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

* commit '16296180984756e631611005179f42865af35621':
  Fix an unintentional change in method signature and avoid an API change.