Import translations. DO NOT MERGE am: c89d5b0093
-s ours am: 335a436998
-s ours
am: cf297dcca3
-s ours
Change-Id: Id81f76f748bace0d87d03e2f5ff31dcc9f32750d
This commit is contained in: