Import translations. DO NOT MERGE am: 76179cb428  -s ours
am: fb31ee8fef  -s ours

Change-Id: Ic649b7788ba28af246d1344eb8a067f715822f52