Import translations. DO NOT MERGE am: bff09ae3c8 -s ours am: 305004ba4d -s ours
am: 7abc47da41 -s ours
Change-Id: Ib4a3c8cc185c893f478ad8858fc7b5c61eb6c084
This commit is contained in: