Import translations. DO NOT MERGE am: 6acf691f62 -s ours am: 557f83edb5 -s ours
am: 2e8fd872d2 -s ours
Change-Id: I4c0d3662ad4597aa68016d1d526c7794f4ae833a
This commit is contained in: