am 9d7c4d4a: Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev

* commit '9d7c4d4a6e4683862931b3a11c974715073514ab':
  DO NOT MERGE. Remove service component for KLP.