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

Change-Id: I526c0050382d43014a2bc52e3cd908355e4ceb33