Import translations. DO NOT MERGE am: 82eff79103  -s ours
am: 69ca405545  -s ours

Change-Id: I7fdd07250de1e33328b722b5406c761dec56a5ec