Import translations. DO NOT MERGE
am: 33e43a7f0b  -s ours

Change-Id: Iaefca37141a0c29a6031b75f0ee7b8b343a5e3b6