Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86496c0a8e  -s ours am: 3ab5fd5619  -s ours
am: 3ae1830916  -s ours

Change-Id: Ic9bc58a9478d4ab0c5bb17a754a178ddc94fd791