Updates for .32 kernel support

Change-Id: Ib4061bc686f4b8b919d289538ddbae09d7540080