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

Change-Id: I26f4be3e0e4c60267065f1857806ec7ca18e7b62