Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours am: 3040f703d7 -s ours
am: 1417a5b268 -s ours
Change-Id: I5183a52cdea96632273f993c40ab11001ae8f3c2
This commit is contained in: