Merge "Remove or reduce visibility of deprecated methods" into klp-dev