Import translations. DO NOT MERGE am: a7c62ac9fd  -s ours
am: 8b6ca823e4  -s ours

Change-Id: If59d7184d891faf93bf1541ccc2bfe620ac5dd6b