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

Change-Id: Iff4a81cc730f7d35d95da27937df2d171b3379d9