Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81  -s ours
am: 5a4b06803d  -s ours

Change-Id: I00ea5acfa526d81275424043bccb3455fd0d0d1b