Intitial Code Blue Kernel adaption 2/3

Change-Id: I6091bec79a15ab3fb7407cc63b7c64383cbc536c

fix confl