Merge "Import translations. DO NOT MERGE" into oc-dev am: 9e8fa5ec61  -s ours
am: d232463193  -s ours

Change-Id: Ibda3fa55ced29f7ad8001cc4a1bc1c077eca3351