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

Change-Id: I5015d0bc4c6c94aa2f3c777f3a1434ee44527f03