Import translations. DO NOT MERGE am: 7e33c8c4d2 -s ours am: 4415f7ceca -s ours
am: 00a748e8bf -s ours
Change-Id: Ic3550a31e6bd1f14830d0674464ba451398f117e
This commit is contained in: