OMX changes

Change-Id: I06876fc48d336d83347d91f5b895bb87a5b6e354
Wifi fix

Change-Id: I516ccb8d91c40f7a666e87e5872803c1b14344aa
wifi fix2

Change-Id: Ic64e2f3bc538809f612856b2df98c3028aa60e97