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