Import translations. DO NOT MERGE am: 39eb3b4ac2  -s ours
am: 28fbde286d  -s ours

Change-Id: Ib6de23cd75229a335ad8d318b6acc26d5c2da0b4