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

Change-Id: Id4a8d9d891b06a789132f9d9915306f336f52902