Import translations. DO NOT MERGE am: 327f6730c7  -s ours
am: 71e3e281e2  -s ours

Change-Id: I57cffb694d687744790736f0d417ffb8be802faa