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

Change-Id: I384541fe2899c577f976de58b21f43519ed66075