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