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

Change-Id: I0bb86e97bf9e1dbe7aa0de9ba4bde9e72bce7440