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

Change-Id: Ie5eecd3eb47358918a536227ac8884b11cbbef5c