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

Change-Id: I4be65bdb164ecf13c5d89316fb12d32ca69d8bb6