Import translations. DO NOT MERGE am: 1b7051a709  -s ours
am: 9a0278c50f  -s ours

Change-Id: I8db70179b3667f200a2ffe0eb27f095bb4c998c6