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

Change-Id: I1152e6a6052862f54489fc48be76bde57120068d