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

Change-Id: I74d6220a3ec75c941b31cb4bef960dc21aa4bade