Fixed missing keyguard; Build error...

Change-Id: If54b83acd949b7e96e3d850720c9e08eadce15b7