Import translations. DO NOT MERGE am: 2a3b062c4a  -s ours
am: bb2a8f15cb  -s ours

Change-Id: I41d1afe145de55b33b6b20db3392d99e3debed19