Import translations. DO NOT MERGE am: 45da426dd6  -s ours
am: 4b7d93c55d  -s ours

Change-Id: I065f9e05c857a0602a36978b247385b1bed14183