am ec850cd6: Merge "Update comments" into klp-dev

* commit 'ec850cd6c60a4ab6c3a08df603e3c9ca3150a9fc':
  Update comments