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

Change-Id: Ic676db47b28486d5c11786a53b0c7fb91d0f2074