Revert "hw_0922_R0231006"

This reverts commit e01db383890240b4c928d5b37c0b99ce48694caf.
Revert "Revert "hw_0922_R0231006""

This reverts commit 4b094a06f7231550564505e114e97ed3b3b62d8a.