Import translations. DO NOT MERGE am: a54b679f2a  -s ours am: 1d4aff76fa  -s ours
am: 23e3ac4cb5  -s ours

Change-Id: Ib6aee525905d5b38687214e2d9a386a246cba7b5