Import translations. DO NOT MERGE
am: 0bb823a2f6  -s ours

Change-Id: I5fbceecd1c58b1e33a802efd5ea04b1d008828cb