use short locale IDs when possible

Change-Id: I19e28fb351d7f7b83ef737430df8c95ed65b0e09