Merge "Selectively load kernel modules based on current kernel number"
am: 34ca3f54b8

Change-Id: Ie4fe1d173c325e7f439ebc73b45578200214cd8f