Import translations. DO NOT MERGE am: 5e7d7e48f0 -s ours am: 4b31a0eff4 -s ours
am: 3956a928a7 -s ours
Change-Id: I0b243454c1e2f899f0baac6473b43038bcbc1545
This commit is contained in: