Import translations. DO NOT MERGE am: 2dceb0fe40  -s ours am: 2b41d966ab  -s ours am: cd841d8aa1  -s ours
am: 8ff2db7145  -s ours

Change-Id: Ib83ecffe04c61accb086ba2a7fcbd8e9f38d491e