Merge "Embedded country names in the app for ones not in framework" into jb-mr2-dev