Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 62bee2f5ff  -s ours
am: ad38904231  -s ours

Change-Id: I59488902d845e12d630ede0462d30a9a933e2261