Import translations. DO NOT MERGE am: 683fdb8177
-s ours am: 89ebaf6c52
-s ours
am: 82446dc8a7
-s ours
Change-Id: I52855274f49bcad4141468c296b36ce1b62c0bcc
This commit is contained in: