Aside from the fact that these were picked from 4.19.y (which should be referred on the cherry-picked lines), these have showed to fix the issue. Acked-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>