Import translations. DO NOT MERGE am: 6daafd06a8
-s ours am: a9ad38d3a5
-s ours
am: a48db7404a
-s ours
Change-Id: I069f872cf341e2881a7331f8de176e12322d3940
This commit is contained in: