Various fixes to alerter module

Change-Id: I1df471a332279872e7921d67f726a464a022ce69
Merge "Various fixes to alerter module"