Merge "Load kernel modules from /lib/modules/`uname -r`_$(page_size) if present" into main