Merge "Added extra message enabled check when receiving alerts"
am: dea5466530

Change-Id: If3d6cf17366897da5509bba7afcc6e383cf128bc