Import translations. DO NOT MERGE am: a409b4126a
-s ours am: 05938c0fb4
-s ours
am: e5405d6efc
-s ours
Change-Id: Idc7bbfd84b15a0559ec1041cabd9a36fe0880190
This commit is contained in: