Import translations. DO NOT MERGE
am: db68fc320f  -s ours

Change-Id: I178cf3af6e91249aed1ed457bcbc88eb2d7f86f1