Import translations. DO NOT MERGE
am: 2bfcd92a56  -s ours

Change-Id: I2d08c0a99eafd4e22c5a136c719b9e03b64a738b