Import translations. DO NOT MERGE am: b6c7b5d4c2  -s ours
am: a324dd45e7  -s ours

Change-Id: I56a85333f83ff811a0b914a6bb9e1ed2659bc56c