Resolve conflict between master & sc-dev

Previous ag/14186080 aim to CP the missed CL from master to sc-dev
However, that CL also change a little bit code and introduce
sc-dev do not align master branch.

Test: atest WMShllUnitTests
Test: manual
Bug: 178445384
Change-Id: I27f3dd75c03961f520cc03094ea31aabe2c1e6c6