Import translations. DO NOT MERGE am: 05185952c8
-s ours am: 64ce525c6a
-s ours
am: b0126e3500
-s ours
Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
This commit is contained in: