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

Change-Id: I59c5213db2534724e11d0eadf049d9d5489ffa18