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

Change-Id: Ieac3186dbb446b1d08ca96618a96b1c1493553c6