Merge "Fix failing LinkifyCompatTest test." into nyc-mr1-dev