am a245a4f1: Merge "Update the APIs to fix the build" into klp-dev

* commit 'a245a4f14ed9e477ce1c68b54bf14a745d7caf47':
  Update the APIs to fix the build