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

Change-Id: I72429cb61a13d13c8508bec4532d703d9d93560c