Import translations. DO NOT MERGE am: b046cefd8a -s ours am: f538e8865c -s ours
am: 6f3d1ac7fb -s ours
Change-Id: I83d5bfe362a355082cdbd9ecdc4901e263def523
This commit is contained in: