Merge "Fix DozeConfigurationTest"