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

Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f