Merge "Merge "Revert fixed at links." into nyc-dev am: c77b72f244 am: ed870fccb4" into nyc-mr1-dev-plus-aosp
am: 04f7418362

Change-Id: I0cfa9147581034beb9333d6d1481d80c3e6a3c96