Modified AK 0.2.4

Change-Id: I5506a1743d8251fe9a470f1df7599c3d672a096f

Conflicts:
	kernel