Merge "Import translations. DO NOT MERGE" into oc-dev am: 67a947b636  -s ours
am: 95657195ca  -s ours

Change-Id: I46e87727da55349410a0ef208a4dac8ae41c2aa5