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

* commit 'f012b777912c4be6f12dc788db5fb2fac8fb5cc0':
  Fix some doc issues.