Import translations. DO NOT MERGE am: 47ff6882fb
-s ours am: 4c6da8edd9
-s ours
am: 940f2b68d3
-s ours
Change-Id: Ia5abcc8c8a98138c38e0d3a1b2b720ee1042271d
This commit is contained in: