Merge change 6485 into donut

* changes:
  Cleanup Toast.java.