Import translations. DO NOT MERGE am: 4eab71c931  -s ours
am: 6ed391b1c8  -s ours

Change-Id: I4b68296bcdf0db7a09be01d70def84a48ed4dd47