Merge "Fix logic error in WMShellBaseModule.java break OHM function"