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

Change-Id: I44be0362b31a91c724b7d5c8da7778bbdfc30990