am 2472128a: am 888bd6a1: Merge "Prepare SDK for KLP MR1. Do not merge." into klp-dev

* commit '2472128a5cada24799f1bcaafcbf5e0ad70da4f6':
  Prepare SDK for KLP MR1. Do not merge.