This paves the way for supporting Ubuntu 24.04 eventually. Change-Id: I920fc637f594d1278b5ca2b88a54c0dce1a5892a