* Revert "Revert "SSCSCI-1456" (#1704)"

This reverts commit aa5e8ae38fef7961227994547822a349e1e452ab.

* fix by adding constructor without hmcHearingType

* attempted fix

* checkstyle fix

* removing redundant constructor and isNullCheck