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

Change-Id: I507f95c26792fc7ef11a45c802640d52192afe3e