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

Change-Id: I033bbb7c0fa44047a3d160795f4ef4da5ed8aa92