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

Change-Id: I32484f5c5715c17c439d5ff20fcd8e46b8061c18