Import translations. DO NOT MERGE am: 271f042229
-s ours am: 45215ab25b
-s ours
am: 7f4ded6b14
-s ours
Change-Id: I2cacfd33eb554e4d14c6bd6dfeae55af395dad4a
This commit is contained in: