Import translations. DO NOT MERGE am: 1a938cfdef  -s ours
am: 0e29a9ea0a  -s ours

Change-Id: Iaef7b61cc98ebb4d36fc4b1246cda2fb13c80f3b