am f32e3965: Merge "Fixes to the google review comments + spec 1.1" into klp-dev

* commit 'f32e39656b9250c22e0b5b99676f382b99b135a3':
  Fixes to the google review comments + spec 1.1