fix cm10.2 cherrypick and add mw for omni-4.3