Bug fix in Alarm where it was not getting called correctly if the new timeout was set that was smaller than the previously set timeout am: 6f2bb1ada5
am: 562e04035b

Change-Id: Ied2ddd21deff40443ba30fcfc18179fe1cd09c69