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

Change-Id: I9e321e4bd090b976dda07829bec093008ac59966