Import translations. DO NOT MERGE am: f812207041  -s ours
am: dd2a43f2a7  -s ours

Change-Id: I571bf9a1863b3ecdab68afade3f5f40a2b28140f