Revert fixed at links. am: 7c70fed347 am: 4a60ffd518
am: e2b498241a

Change-Id: I0f40cd7bdc31dcf0f3865f3ff70a9e8012aedfbc