Import translations. DO NOT MERGE am: 46d4346dcf  -s ours am: ae48142467  -s ours
am: 89d22d4c12  -s ours

Change-Id: Ibe64f20446b1741c18c483b9e64f6902c3bfb950