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

Change-Id: I92c4c7543cd2b39c4bee62377b8231d02477f5cf