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

Change-Id: I21123baaa211d19af181c970b7ad85051c7d08b7