[automerger skipped] Import translations. DO NOT MERGE am: 8dda6713c0 -s ours am: 5f83b0c3ad -s ours
am: 70d16635fd -s ours
am skip reason: subject contains skip directive

Change-Id: Iaa3258bbeea7a52d9044f40e8fd52cf66dd6fb0e