LPS-33531

Hi Amos,

I have done changes for LPS-33531.

Please review it.

Thanks:
Ankit