Import translations. DO NOT MERGE am: 1b9fbcf993  -s ours am: fd9d6dc79f  -s ours
am: 046e9191ca  -s ours

Change-Id: I8ff424decc8a8de1da6f3208bbe9bbaa1af931fd