Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff  -s ours am: 4d681e127b  -s ours
am: 418530d4f4  -s ours

Change-Id: I27b4242e46dd37ddf53fc43f7bd1aa1952fa703f