Import translations. DO NOT MERGE am: c163ea9a66  -s ours
am: 51d8e8dfb1  -s ours

Change-Id: Ic9ac603758436256359c6b96c80ce90593e4a1cf