Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220  -s ours am: 46181531ec  -s ours am: 133d4881ef  -s ours
am: 64a7b9e43a  -s ours

Change-Id: Ib23c7602cf0e3cbba93e22c5232adb2d205a2ebd