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

* commit '6a088c4c0f0024f056ce0b6596ebaf6fe4e8f5aa':
  Update comments