OMX changes2

Change-Id: I320c5bba0e9818d8e40bcfcb6a65650d9f3cb316