am 3354f4dc: am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes

* commit '3354f4dc3de531cf5e5039c0b9f40de4fbdac255':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes