Import translations. DO NOT MERGE
am: 4a8554f78b  -s ours

Change-Id: I6b3c68afe103885439d18237703ab0626cf115f5