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

Change-Id: Ie552fa0388e0114793fdef979ca7b4b07b103b5c