Import translations. DO NOT MERGE
am: 2deaba905f  -s ours

Change-Id: I4d456a029be23f5a716cac7b3132cdf82f27bac9