[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

Change-Id: Id2135d79c7293256c74e6966f6add4bbdccb0621