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

Change-Id: I6e4932469886f810162460c5de855c46d2f2fb2b