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

Change-Id: Ieae251c3adba8ffa18ae4943a38c7cbfb60eaeab