Fix message key and default user option for Echo

1. Update message key so it reflects the latest change
2. Update default user option for Echo

Change-Id: If26a18f884d3f6ae0609c6a93ebaa8d648d89b81
Merge "Fix message key and default user option for Echo"