added alarm handling

Change-Id: I187aa0f46901e691e2624c4177cdeb0dfd369253