Import translations. DO NOT MERGE am: 7c2b27f26f  -s ours
am: dcb5e77673  -s ours

Change-Id: I2f04880b253b79e28dceeb48237dd612b720fdba