Adding changes related to JB  4.1.2
Reverting back head of  ryan
Stable fix for Alarms on JB 4.1.2
synced with ryan/master
credits added for fix
Merge pull request #4 from chhapil/master

Pull request for Alarm JB 4.1.2 Fix