Import translations. DO NOT MERGE am: 3a1bec7197  -s ours
am: d08c19e2f5  -s ours

Change-Id: Id5633cd37bac5c25d12941fe19c47c95b3ea6792