Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636  -s ours
am: 3183fb75ac  -s ours

Change-Id: Ia39368e2fdcaeabe757a02b740ea9a1dab6eb653