Import translations. DO NOT MERGE am: 4702b22ed5
-s ours am: 11a58be734
-s ours
am: 4097006da3
-s ours
Change-Id: I4a3e09357122f67acb3a1021653faa58ccee9955
This commit is contained in: