Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev