Import translations. DO NOT MERGE am: ee70251c4e  -s ours
am: ef5715b583  -s ours

Change-Id: Iafee148b7a88a4c037ad44f3918328ee005c72c2