Import translations. DO NOT MERGE
am: 9286a78c21  -s ours

Change-Id: I42f67b9a630769b37f3340f2997b8b30ff6a4907