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

Change-Id: Ie7a2b95b30a1277ea8d946ff26394aedf9454889