Import translations. DO NOT MERGE am: 6da15efecc  -s ours
am: bed39c40ee  -s ours

Change-Id: I7274e1eb0f992bfccdc219b16c27f4b85b9cffd2