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

Change-Id: Ife0c099cf368e756f9ada5a88667563bcd90121a