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

Change-Id: I920bb3060556824d8185701b10ea71828e242591