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

Change-Id: I755f5b84aa8444d48a7c1c34db9ae5d70a9b7aa9