Import translations. DO NOT MERGE am: c1b04d9d03  -s ours am: f33f6a5adc  -s ours
am: c61200a139  -s ours

Change-Id: I73cb40991a48e2872d16bbaf3ae33d64058a3d0e