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

Change-Id: Ie7c7889d3a856de32f24acf1f9173b44105227bc