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

Change-Id: I0b5d229f363d026da1b54912a80b3c14af4d06d3