Import translations. DO NOT MERGE am: 8385775f42  -s ours
am: f890ad9fff  -s ours

Change-Id: Ie229593c7a1848b592fd8bc2bc8674ab6f704b02