Import translations. DO NOT MERGE am: 5ef922800e  -s ours am: 11a1ebd4da  -s ours
am: ff7812de7c  -s ours

Change-Id: I824076eca045921d83fd655b13df69b6b8ced4e0