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

Change-Id: I2ff8751dcedf1648b145a559c0dabce42f944bf0