Import translations. DO NOT MERGE am: 44fc3e0900 -s ours am: 1a9f44a604 -s ours
am: ffcdd21814 -s ours
Change-Id: I118efb46fb9ad277e893e051f3110e90ee534b1d
This commit is contained in: