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

* commit '9fe182672cbe6d3b51cecb722a629cd8eca15c71':
  Reset System properities between tests