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

Change-Id: I509897896e4a9930da187f4f2270050063073d46