Merge "Revert fixed at links." into nyc-dev am: c77b72f244 am: 8ea167bf7a am: ffb31e9954
am: 99e8284514

Change-Id: I3cafba5a53c0a94b0569bbed1652f1fa61e69c88