Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123  -s ours
am: dfd75c536f  -s ours

Change-Id: If8ab0ac81b196e61796bb21d5294d2e30d5415a1