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

Change-Id: I42487bdadc12fad135ac65dce0dfd6f77a9b9365