Merge "Tell the factory it is already serving a request."
am: ae79013ec2

Change-Id: I4c3948c2e7098668cf881d3f31fda87be1250828