Import translations. DO NOT MERGE am: 69fa3bcb6c  -s ours
am: 949c4b8db8  -s ours

Change-Id: I6a324b7778fca58ca48450dd9254fda530ccc100