Update boot logic for LB kernel
Merge ROM and Kernel changes