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

Change-Id: I60cc91a65e818cb78663647bfa249c896a7cff2c