Merge "Check defaults for Android default-emoji characters [DO NOT MERGE]" into nyc-mr1-dev