Join FactoryLoader threads

Change-Id: I22b313a895057edebc8bee715813de908826763a