Cherry-picked from b7a027f905bd36d3de4e28b6373d21946805778d
b7a027f905bd36d3de4e28b6373d21946805778d
--> only on the lte side