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

* commit '10d44a762e63d02c403a35c4f112dc8f5aabf94b':
  Update the APIs to fix the build