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

Change-Id: I86df56325e5d9aa00bd4b1c5cfa1f85123cec1c6