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

* commit '353ec47422cbd1bb40f19e7ec9ec6b4f300ee3ab':
  Fix some doc issues.