Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 51e35963ae  -s ours

Change-Id: I54774e5f20216a738ba315f5fdaaac6e6f89c60a