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

Change-Id: I0362a2d32dfb655560f9e8ae3b9ec583ad45d0e3