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