Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 20f3c4508c  -s ours
am: 2a8734c90b  -s ours

Change-Id: If40b4dc7ae398f9b0d8ae7705ab2abc294b0c55a