Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: d3ad51ae77  -s ours
am: 242c84fa25  -s ours

Change-Id: I2753e9a5800f82740fd587ab3f2d84a7b6b350d7