Import translations. DO NOT MERGE
am: c8864998c8  -s ours

Change-Id: I9f115ff851b0eeb1c6935769f6371f56069dd2d3