Update Echo bug 70139 backport

Change-Id: I9e74965ed732140365d7c884085231ce55b2da58
Merge "Update Echo bug 70139 backport" into wmf/1.24wmf19