Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 08815ac99f  -s ours

Change-Id: I18be08851853ec4eefd1f209d9452f4412ed6584