Import translations. DO NOT MERGE am: c66bffa31f -s ours am: b99a48f779 -s ours
am: 6cffc3f8ba -s ours
Change-Id: I40c7d32687ffe45e54cbafe4b2802d6d2735ea4b
This commit is contained in: