Import translations. DO NOT MERGE am: 7ef6922b49  -s ours
am: 5677ba81d1  -s ours

Change-Id: Ie40087344e103ba205326beb35ad1097e2888b0f