[automerger skipped] Import translations. DO NOT MERGE am: 9789beae0e -s ours
am: bffbb6b060 -s ours
am skip reason: subject contains skip directive

Change-Id: Id00fea5ed1ec1b91c95dd641785499aca3daf205