Import translations. DO NOT MERGE am: 0e03f95cda  -s ours
am: c923fb9dbd  -s ours

Change-Id: I2ae91b57d136baabccc28d012f761fbf76a8c905