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

Change-Id: I75841c18bbccf820d898cb4de009c1e92d1db709