Merge change 26340 into eclair

* changes:
  Update action chicklets in correct order.