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

Change-Id: I9ee8162c0015297eee31e5254ee9347f92cbdc5c