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

Change-Id: I45956469aa428467ffb7039288cd99a177566083