Merge "Revert fixed at links." into nyc-dev am: c77b72f2 am: 8ea167bf am: ffb31e99 am: 99e82845 am: d872507b Change-Id: I92c4c7543cd2b39c4bee62377b8231d02477f5cf