Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e916c1a05f  -s ours
am: f0f1bb9ca0  -s ours

Change-Id: I79b6d82105c11124b8f3734d23f77598976957d0