Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev