Import translations. DO NOT MERGE am: 8a25fb603a
-s ours am: 9d7971905c
-s ours
am: a2954b3232
-s ours
Change-Id: Id6eb63a599efb450f30d5dddc0973c1936daf6df
This commit is contained in: