Update Echo to master

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