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

Change-Id: I4236bf67b979ae4a4d89548291e4d4161d455415