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

* commit '888bd6a12473a4bfca36c691e187d9fc041411fe':
  Prepare SDK for KLP MR1. Do not merge.