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

Change-Id: I2ee03bed08613ad562cd62fdae1c1bc526c10be4