Merge branch 'stable-3.8' into stable-3.9 * stable-3.8: Replace commentLink.html with commentLink.link during init Change-Id: Ia7a302ad9d71a6ce48536ee67739295600ed6025