Merge "Remove unused APIs and rename others based on API review" into klp-dev