Import translations. DO NOT MERGE am: 4ddf46c232  -s ours
am: 0a8e25b981  -s ours

Change-Id: Iefea41be5e19a1d51eddf2e96ced197398b7f374