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

Change-Id: I9ffdc8e90d55d429ae96be3153497e8cc1231e22