Ensure that links are displayed

Change-Id: I0be967d9f838c960f2d682e6c24a3e204cbe7b9d
Merge "Ensure that links are displayed"