OMX changes

Change-Id: I3d7ec778c83579bc2e05ad280df67e9c7d1192d9