[automerger skipped] Import translations. DO NOT MERGE am: 8e24ea2b4c -s ours
am: 7c761462a6 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b77a3fa16845d90f8a678be3b656d0a56f2ea86