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

Change-Id: I8d3cb213d5d83e2e4195d5bda3884cf84e575336