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