A bunch of Echo style tweaks per Vibha

Change-Id: I1317b1dd670c8f7a33b62bb7d86a6d25d841c6a1
Merge "A bunch of Echo style tweaks per Vibha"