Merge "OMXNodeInstance: Do not use already freed memory." am: f5b1d442c7
am: f90a0c07fd

Change-Id: I588048ad82829f833c68fabf12e20b760764890c