Merge "Fix logic error in WMShellBaseModule.java break OHM function" into sc-v2-dev