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

Change-Id: I33cb88cdcb797a7868d32f8caead5aa6707e8dc9