Import translations. DO NOT MERGE am: 65cdfbaad6  -s ours
am: 17dbc1ab21  -s ours

Change-Id: Ia9edc4cc8d565d853d3a379284d3704568dd83e1