Updated find_notifications to work with new notifications

Change-Id: Iad2e86619c130496bf9cba7ed82b8786f4176462
Merge "Updated find_notifications to work with new notifications"