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

Change-Id: Ic6a6339f1fa5f79b355785947d4796f56e6df8e5