cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708
docs: misc doc fixes

Change-Id: Ib5f8aaf8feb42c825bc0149ec3775999856f5f57
2 files changed