[automerger skipped] Merge "Tell the factory it is already serving a request." am: ae79013ec2 am: b8b94ba4c0
am: c94bd038f1 -s ours
am skip reason: change_id I597ac588f76dd507512ff02868fd1310b7e63f7e with SHA1 08577fc579 is in history

Change-Id: I19e8d1b43338fa64eaccf9ae3039c878ff7cf3c5