Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours
am: 60af01bec9  -s ours

Change-Id: Ib420dbea84af5bec2926bb2abcf804038c977634