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

Change-Id: Iabdc2a26176481290232279bda74f73780d39cac