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

Change-Id: I4170e095966f1d8752e2b020777b5719a779b376