Fix compilation errors in Kernel 4.4 version. Change-Id: I08ce390a7983cfe70b46a48d22d6cfde11dc4c30 CRs-fixed: 1026152