Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a  -s ours" into oc-dr1-dev
am: 2eb4ec0e72  -s ours

Change-Id: I2447e12325c6ef7d6152c17c1b7a6236b0aae313