Merge "Revert fixed at links. am: 7c70fed347 am: ef69678105" into nyc-mr1-dev-plus-aosp