4.3 commit cherry pick

[Jayapal Reddy Uradi]

Hi Animesh,

Can you please cherry pick commit to 7255e50f2051aff1cb5e1991e2dde4ef48f57454 
4.3 branch 
from 4.3-forward.

Thanks,
Jayapal