Import translations. DO NOT MERGE am: f33d91e23f  -s ours
am: cfc669fd72  -s ours

Change-Id: Ib3a9cba925323a5fd90126662d832513583846ec