am 63837433: am c5686e15: (-s ours) am 2472128a: am 888bd6a1: Merge "Prepare SDK for KLP MR1. Do not merge." into klp-dev
* commit '63837433aef04baeb2d02dd127ecfcfd30630762': Prepare SDK for KLP MR1. Do not merge.
This commit is contained in: