Comment 61 for bug 1846016

This affects generic kernel on Disco or above, and -oem, -oem-osp1 kernsl as well.