* Deleted unnecessary import.
* Added back SafeMath.
* Removed another unnecessary import.
(cherry picked from commit bbe804a14b)
* Deleted unnecessary import.
* Added back SafeMath.
* Removed another unnecessary import.
(cherry picked from commit bbe804a14b)