Import translations. DO NOT MERGE am: 7826adc3b3  -s ours
am: 64ebf71134  -s ours

Change-Id: I9afed8fd9581a1a022a6a73c15f9e922320b06d8