Import translations. DO NOT MERGE am: 7f5b5eee99  -s ours
am: 3aa778d239  -s ours

Change-Id: Idaf4afb7a5b9d94bdc46ac765781ffa23f79e337