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

Change-Id: I060033ee0e59cb6ce7a1bcfb54e4858266e3c370