Update Echo to master

Change-Id: If3b68cad2e499278cdefeb0a43878b3a51494bcf
Merge "Update Echo to master" into wmf/1.22wmf13