Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 04a65d2e70  -s ours am: e9d8b2b5f4  -s ours
am: aebeafdcc8  -s ours

Change-Id: I4a1feb87ba6fb32d7abc0f633fe5947504cd5e42