Import translations. DO NOT MERGE am: 1b9fbcf993  -s ours
am: fd9d6dc79f  -s ours

Change-Id: I9a760e75c93edd7b2c4a2affc8a455746edd9935