Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours
am: 899f5cf309  -s ours

Change-Id: Ia3d156d8da37e54364775285658dbdfd4f176468