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