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

Change-Id: I7004ff8745bf3ecbb1e947d5c064cca955f9e35e