Update for kernel changes
* Needed changes for franco kernel additions to the kernel

Change-Id: Ifd5cbe2d11f15fd3014dffe7f963896cce900096