Merge "Remove legacy HCE APIs." into klp-dev