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

Change-Id: Ieb184cb9223a86d2711c52f08bf1634ad5e2f759