Using clear_override in tearDown.

Change-Id: If4ae1ba9dd70c69cbf162ca1c418bee6967e12f9