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

Change-Id: I250606ea6088f6deedd77aec93af2c615488ded7