Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 28abd94074  -s ours
am: 130f1a6b5e  -s ours

Change-Id: I2a87a73363d9e665db8616e320a08e487187a487