Import translations. DO NOT MERGE
am: 861eb3eb75  -s ours

Change-Id: I9a860c40f6e24aa4a0a244cfd878a34ce2ce5947