Update Echo to master

Change-Id: I2e5b51cee5a3b8add709a5bb7ee4ecc692025343
Merge "Update Echo to master" into wmf/1.22wmf4