am 8029493f: am f012b777: Merge "Fix some doc issues." into klp-dev

* commit '8029493fa2a37da41a73dde60dd17fa53cb6a77a':
  Fix some doc issues.