Formatter Fix for related Echo change

Related: I42f4d7566543332588431c21c220c0d64d026b70

Change-Id: I5dc82a66f3aa289da1ff1a2f1ccd2db548b6bb66
Add Flow notification to 'message' notification section

Dependency: Id001c5d5e6671f503048c09be72c1f67d72ca9c0
Change-Id: I37581b09ea68d1c0481ff9bb08041c9bae9d8ced
Merge "Formatter Fix for related Echo change"
Merge "Add Flow notification to 'message' notification section"