am 47983b8e: Merge "Reset System properities between tests"

* commit '47983b8e604d421aefba80962dea816da5167cb0':
  Reset System properities between tests