Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 0b11f3e734  -s ours am: 828550d8c7  -s ours
am: 2ee98e21fe  -s ours

Change-Id: Ifece66182755ea2922fcf092830c6c9fc21e8a16