Import translations. DO NOT MERGE
am: 3025a229ba  -s ours

Change-Id: I1b240370982c3797a2db5797c0c04edddb098ed0