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

Change-Id: Ifef4e9a5e87630d93b45666c1851aafc28aca708