Import translations. DO NOT MERGE am: e6b5a4bf3f  -s ours
am: f17194ced3  -s ours

Change-Id: Id90ae77978e791db52006d802240a6d40aa2f84f