Import translations. DO NOT MERGE
am: 11fdfbdee8  -s ours

Change-Id: Ib52665b289bc924bb84578bc8a7fa8cd5050ba65