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

Change-Id: I857bdc01055cc8d5903fd4d9909601f1b6b57ea9