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

Change-Id: Ia9300d42352834b86cd789d6e8167d0c47220a65