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

Change-Id: I72c2c8bb49d37bf60db0e8002e20554341119656