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

Change-Id: I653c3539906407229bf98b2646706083aba88334