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

Change-Id: I5575bf4baca4d37cf8d31a9eda5524381a4b034b