Update Echo to master

Change-Id: Iaa2b7afbd1271f5dd54168909cdb0232be37efda
Merge "Update Echo to master" into wmf/1.22wmf3