Import translations. DO NOT MERGE
am: 1cc590b3a8  -s ours

Change-Id: I6c8ea3b3de6db4bd701786441697f94386523957