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

Change-Id: I77f671f447ddf1a9e169adc6ae9ef81dc8f19c86