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

Change-Id: I665f00bf819cceab8f3e65f83a62a821b36e5907