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

Change-Id: I0921d580930cdc2ad427794f9310522d24e1a1fc