Import translations. DO NOT MERGE am: 8a25fb603a
-s ours am: 0c3ee7c15d
-s ours
am: 565664fad7
-s ours
Change-Id: I58da132af7b082860813238be8b054955629cbc9
This commit is contained in: