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

Change-Id: I0da1baa7455529b012b338fe465aa7057483fffd