Import translations. DO NOT MERGE am: 7c4d3912f3  -s ours am: 2a66c5bd84  -s ours
am: fb653868d4  -s ours

Change-Id: I3492281aee98f71f9bd94b7b5ceb951fa8baff59