Update Echo to master

Change-Id: I80cc9222c6d2e0c6d0eb77194992e4d86cd132eb
Merge "Update Echo to master" into wmf/1.22wmf1