Merge "Import translations. DO NOT MERGE" into oc-dev am: 2758e3af09  -s ours
am: 748d6e3404  -s ours

Change-Id: I5709f46bc7d85dd8de4a205cb8b7e1aaac71c0f0