[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba am: dce12d183a am: ad0ec9b3af

Change-Id: Ia83dfb602b091c512653eb83d7aa43b1c6e44cf2