Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8f8d12fd45  -s ours am: b8f6b581d8  -s ours
am: 2d84ecb4d4  -s ours

Change-Id: I2df1b6346fc0de805bf0f3836a41fa0b18bdcb09