Import translations. DO NOT MERGE am: 8e132ce53c
-s ours am: 38b7d50a49
-s ours
am: 47ff496407
-s ours
Change-Id: I26b4e5178beb47f231e73889675f36bd2340d9e9
This commit is contained in: