Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours
am: 174ba61ad9 -s ours
Change-Id: I1d86bd81943c7cb88f319e2baaf4d194d9cbfc98
This commit is contained in: