Import translations. DO NOT MERGE am: ebe66178c4  -s ours
am: 9954e6fe4f  -s ours

Change-Id: Ib43b6b84f81eb4a62230c8bdcb4e49e2d46552f3