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

Change-Id: If4df3f6424ae3719649f69669fb341e5bacc61e1