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

Change-Id: Id541747a9bcc1011b2197653b1dde02d84b2cf0f