am ef93ca05: Merge "Fix use of dead APIs." into klp-dev

* commit 'ef93ca055b8dfaeff2304784c376cbb0a6c5f073':
  Fix use of dead APIs.