Merge "Patch out part of the emoji tests." into nyc-mr1-dev