Merge change 4646 into donut

* changes:
  Force the id of TabWidget to be android:id/tabs