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

Change-Id: I79586b1902cfed6baa9db8d615e94b4fadab4740