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

Change-Id: I0511a4e65d824d4acd9dd3e62ee58e6f4f3fc597