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

Change-Id: I13d72cc05838f147a88fe62ecfcbfac1b80ee3b2