Refactor ApiEchoNotifications preparing for alert/messages split

Change-Id: If4a79a3c775070bcaed62b6330920f7d82c16f69
Merge "Refactor ApiEchoNotifications preparing for alert/messages split"