[ACS44] cherry pick

[Jayapal Reddy Uradi]

Hi Daan,

Can you please cheery pick the following commit to 4.4
99f75db1ebd35f5afa897e9d94ed176668e04cd5

Thanks,
Jayapal