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

Change-Id: I61cc690d09a6a62a9551c7f40984f7e356974690