Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508  -s ours am: c4e253af2a  -s ours
am: 7790c15c24  -s ours

Change-Id: I8430e1c917c72992dc77cf32309fbec12940eaa8