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

Change-Id: I340bb9df7c736f1c4f22c53cf8919d36f024c32e