Merge "Fix use of dead APIs." into klp-dev