Import translations. DO NOT MERGE
am: 46d3cd00fa  -s ours

Change-Id: I0c2dd6975b7767865e79af0cf342ef62da2d5876