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

Change-Id: I59620cf4de9dc39860b8e1137af6af22a3b805eb