STE OMX Fix [3/3]

Change-Id: Ie67333105f9dc11a273036fbe0a1c37ab5ac588e