am bfc29f67: Merge change 6485 into donut

Merge commit 'bfc29f67db73ac1d21188d1ec942757dc95ecc92'

* commit 'bfc29f67db73ac1d21188d1ec942757dc95ecc92':
  Cleanup Toast.java.