Add rollback logic for Instantiate

Change-Id: I709eab9f880636dd7d4e1fd294b1ba034c6e08a0