Import translations. DO NOT MERGE am: bd1947dc01  -s ours
am: 79036f3994  -s ours

Change-Id: I279299e9aea31a59836f4b8f44bc14af3008f82b