Merge change 25402 into eclair

* changes:
  Remove the extra padding in the Tabs.