Import translations. DO NOT MERGE am: cf2df3bb6e  -s ours
am: 778f8930b4  -s ours

Change-Id: I057aa96192682cd62caebdd2b1db0614d2e81cc0