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

Change-Id: I43463ebcdccbd71229ee344a6af7b943a94d2dda