Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 68b49a3a8e  -s ours

Change-Id: I1249381abcb2c1610a8671af6993121c24280234