Merge "Import translations. DO NOT MERGE" into oc-dev am: 243e5be074  -s ours
am: dfe4011030  -s ours

Change-Id: I29bbf33e2bd3697ecbba5ae366d499b8db09a0ba