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

Change-Id: I95cc8323a6e20d4cdc604dafd0b268fcb42b66d9