Merge change 23906 into eclair

* changes:
  Removing references to deprecated API and the deprecated API itself.