Fix TODO: Move InstantiatorInterface to own file

Change-Id: Ifbe6580bb42a4e29a42b37e521b68b2e6c89a104