Import translations. DO NOT MERGE am: 7821bbd9a5 -s ours am: 82b5fa3fea -s ours
am: ffc2bf7f28 -s ours
Change-Id: I46bd4478a75fc3a40028c35920b88475da753557
This commit is contained in: