Import translations. DO NOT MERGE am: 6acf691f62  -s ours
am: 557f83edb5  -s ours

Change-Id: I4d4f4c323c27dced0088b588567c7b42f3acb3e1