Import translations. DO NOT MERGE am: c8864998c8  -s ours
am: 2f00c0cf07  -s ours

Change-Id: If1eb3fe37fb9a7ba4fda023f3065fbb6fa6745fd