Import translations. DO NOT MERGE am: 3b4a3e0a0f  -s ours
am: 1bc57cbf3c  -s ours

Change-Id: I153443f06806810009bf5bc735104471df8ab98b