Import translations. DO NOT MERGE
am: aee9e596da  -s ours

Change-Id: I917a46e6bec9e4bf83df1182bb5a95374bddc749