Import translations. DO NOT MERGE am: 18a64f201b
-s ours am: fceb2818d6
-s ours
am: 77f8f43e79
-s ours
Change-Id: I27b86acb12e3cf53a5444b3c024626f6da90a67a
This commit is contained in: