Import translations. DO NOT MERGE
am: 1bc2305d4c  -s ours

Change-Id: Ic5eab186baa14cbd7e748e9c7e56a7ec2e8cc6eb