Import translations. DO NOT MERGE am: 780931dd46  -s ours am: 5c7aa32ff3  -s ours
am: 84f86ec99c  -s ours

Change-Id: I6537b902cc1ba74ad111039f62940255546342d2