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

Change-Id: Iac87034d218ebdefbe1879192148ad323388c87c