am 79bb43f8: (-s ours) Merge "[DO NOT MERGE] Drop KLP sdk as of build 775725." into klp-dev

* commit '79bb43f8978303822c21fadba83395f5648b80f5':
  [DO NOT MERGE] Drop KLP sdk as of build 775725.