Check for valid state on alarm update

Change-Id: I5a4612528c577ba8ab57b4383bbbc8344bf329de