Import translations. DO NOT MERGE am: 005fec50c2  -s ours
am: af90362859  -s ours

Change-Id: Idc56cf4674fa40d6545ebc1a81e97b6a81f730de