Import translations. DO NOT MERGE am: ef67a7e8d8  -s ours
am: 9535ed2c6d  -s ours

Change-Id: I5b13943117e7f735d4ec75f0478278964c874cdd