Import translations. DO NOT MERGE am: f812f94216
-s ours am: bc4faa93e2
-s ours
am: bf24c5db83
-s ours
Change-Id: If9f14b394f7fc6148ac621daa513319bfdfbaeba
This commit is contained in: