OMX changes

Change-Id: I06876fc48d336d83347d91f5b895bb87a5b6e354