Import translations. DO NOT MERGE am: 475763d01c
-s ours am: 9a22968ff8
-s ours
am: 88b043714b
-s ours
Change-Id: I733c0d9fc99ffe62dc43ff32e0d9067ab2e1fa23
This commit is contained in: