* commit 'e9123960764d7b2e94fb0d68aae21fccc472abcd': cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes
* commit 'e9123960764d7b2e94fb0d68aae21fccc472abcd': cherrypick Change-Id: I00fd449b1daf5b75d6a051af46bfa6e45d131708 docs: misc doc fixes