am 3efb17f6: (-s ours) DO NOT MERGE: Drop SDK@870732 from klp-dev.

* commit '3efb17f6b41a81910ffa7fa5ea7c11b9454f7dad':
  DO NOT MERGE: Drop SDK@870732 from klp-dev.