[automerger skipped] Import translations. DO NOT MERGE am: 49192ae51d  -s ours
am: 28dd295e7f  -s ours

Change-Id: Ie22f9db9b8b97dccabb896505fd45ed9ac555741