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

Change-Id: Ib0241e17096194d42aed1d31cabf1ab7dde44719