Import translations. DO NOT MERGE am: 7e581e8c89  -s ours
am: a8fa7bc1bd  -s ours

Change-Id: I23b0e26bb95a479b7515d01e1c021378940f5e9a