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

Change-Id: Ia30e446f617a52ec84720362fed47707aba56362