 09e682555f
			
		
	
	09e682555f
	
	
	
		
			
			They were separated only to make it easier to stubout, but we want more test coverage, not less. So merge them together and fix the tests while we're at it. Change-Id: I18333017868b91fb71b8d3dce831463a1cd5bf81
 09e682555f
			
		
	
	09e682555f
	
	
	
		
			
			They were separated only to make it easier to stubout, but we want more test coverage, not less. So merge them together and fix the tests while we're at it. Change-Id: I18333017868b91fb71b8d3dce831463a1cd5bf81