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

Change-Id: I8c2817eb30613de0dfdda6df22b4c14bdebc2827