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: a2125e1d10

Change-Id: Ib67b5fffb698dedf03a936d652a12f053027a902