Import translations. DO NOT MERGE am: 251cbcbcc5
-s ours am: 3d6acb722c
-s ours
am: f1d7a456ea
-s ours
Change-Id: If0f5b5f1fc2cc6e7ac6ab74e2ce0506cc009f5a2
This commit is contained in: