Import translations. DO NOT MERGE am: 9230fa74ff  -s ours am: e7ff9a8ddf  -s ours
am: 8aacd9c584  -s ours

Change-Id: Ie8ddd64f5f389b1c51de5c2cc50435a6be4d330d