Import translations. DO NOT MERGE am: 63901ed60a  -s ours
am: 9348f2c339  -s ours

Change-Id: I95b42c7aba1d0785e0070bedf0f26936f83d3e74