Update Echo, Thanks to master

Change-Id: I45aa0eb7fd371cbf6e31ac844df028a09f0e779a
Merge "Update Echo, Thanks to master" into wmf/1.22wmf6