Merge \"Patch out part of the emoji tests.\" into nyc-mr1-dev
am: 2f39bc777c

Change-Id: I90c3528cf6d85929114af94feb0ef2f36954ca9f