Merge "Re-enable disabled emoji tests [DO NOT MERGE]" into nyc-mr1-dev