Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d1c17d2ad  -s ours am: 3f1c7d72eb  -s ours
am: e6db3dd483  -s ours

Change-Id: Ibb0be53416c9b550d3e15dbd795bb841671cd418