Merge change 27460 into eclair

* changes:
  Update menu items.