6260 Android language in standarized form

https://swrvedev.jira.com/browse/SWRVE-6260