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

Change-Id: I4b9282935fe15d3c1418edb43506aad058a3e485