Import translations. DO NOT MERGE am: aa451616c8  -s ours
am: 488ea0b715  -s ours

Change-Id: I659e61848ffdacf89249f58fa8776d64670e88f3