Import translations. DO NOT MERGE am: a9d39db63b  -s ours
am: da3f395420  -s ours

Change-Id: Ida0a4fc466a3d363f3d054b23f834fc9a5e6f38c