Merge "Hiding some unneeded APIs," into klp-dev