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

Change-Id: I662c671f8b02c08033f0002ef16941138c835cf4