Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 5b67a302d4  -s ours
am: 5f311906c0  -s ours

Change-Id: I437186c5c0ce68e4b9a3136aa44cef70a997a890