am bc8eaa7d: am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit 'bc8eaa7d63865ee2532014419a0e384c62c7027e':