[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7ba am: dce12d183a am: ad0ec9b3af am: fc7a3a56f9 am: 25e9dff25c am: e8d5d152bf am: 1ff39c654a am: e5d3086f3b am: 301a0078a8 am: 77c35f6cac am: 22eab8fecd
am: 58d53f6c28

Change-Id: I977f6e8af49d8c38033f6e8c046deddda2b2df4f