Import translations. DO NOT MERGE am: 44f9a3fd1e -s ours am: 3978b56311 -s ours
am: 69eb2d9088 -s ours
Change-Id: I201f4771196e290eb2cebbd29b23e8e4fa6f8215
This commit is contained in: