Import translations. DO NOT MERGE am: b8aaaa8949 -s ours am: c967ede5c8 -s ours
am: 6a96cc7365 -s ours
Change-Id: I05f15eec71591052f255d0ee0dae43a5a3119227
This commit is contained in: