* commit '369c1c1fa22802b6504c5cde533d797841700a66': cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
* commit '369c1c1fa22802b6504c5cde533d797841700a66': cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes