Merge "Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev am: 43fed9af am: 5ba27c46"