Initial Code Blue Kernel adaption 1/3

Change-Id: I8a389d4e0676d136d4f3c878cbbaaecc3be1c2e0

fix conflicts