Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 273bb516ad  -s ours
am: 9640d57039  -s ours

Change-Id: I41cdb883ff865fd88b607eb9f4ea5653866e1830