Merge "Call clearSettingsProvider before and after test"
am: 3868fc30ee

Change-Id: I38cae25353df48851280490d4593e70b49f0e6c0
tree: c197367e0f0dac92a8e67640f6bbcc1cf76611ce
  1. core/
  2. services/
  3. tests/