OMX upstream changes

Change-Id: I940679a1699f9deec9db4f83906f31270a2c77d2