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

Change-Id: I130cdd3c8c0bc456bc4a50f4b8354082be188cf2