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

Change-Id: I16c5ec6e7c52e77552577f83cb40b91fa1ff0edd