Echo style tweaks per Vibha

Change-Id: I4111092e32213b50ccb0e8dee849a2edfb645827