Import translations. DO NOT MERGE am: 8a611b1162 -s ours am: 25a04c0b39 -s ours
am: 617f47d77a -s ours
Change-Id: Iaacbd400f5658c89d02b81448e20f1917032aa5c
This commit is contained in: