am 374fd0b3: (-s ours) DO NOT MERGE: Update SDK@872126 from klp-dev

* commit '374fd0b340a73cee97b46b2e6af5a1498d6512b7':
  DO NOT MERGE: Update SDK@872126 from klp-dev