Version 1.1 from ZaneZam Kernel.

Change-Id: Ic8b73a0aa783326441d6bd953c59c38b2022e577