Merge "Revert fixed at links." into nyc-dev
am: c77b72f244

Change-Id: Ia28b1f02a83cd8f0e346e559bb47a4e0b885fbf2