OMX Changes

Change-Id: If7b2cdeab4beb8fa4a71652ee74ecf7e9c24ca9d