Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636  -s ours
am: 08674f3a25  -s ours

Change-Id: I08a17c4bfc3ec26a707b903a7f244a6f9387cc30