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

Change-Id: I8326b898ae59843f0b2ca331e38f078532034e13